Merge remote-tracking branch 'savannah/master' into HEAD

author Andrea Corallo <akrl@sdf.org>

Thu, 14 May 2020 06:14:23 +0000 (07:14 +0100)

committer Andrea Corallo <akrl@sdf.org>

Thu, 14 May 2020 06:14:23 +0000 (07:14 +0100)
author Andrea Corallo <akrl@sdf.org>
Thu, 14 May 2020 06:14:23 +0000 (07:14 +0100)
committer Andrea Corallo <akrl@sdf.org>
Thu, 14 May 2020 06:14:23 +0000 (07:14 +0100)
diff --cc lisp/subr.el
Simple merge
diff --cc src/lisp.h
Simple merge
author	Andrea Corallo <akrl@sdf.org>
	Thu, 14 May 2020 06:14:23 +0000 (07:14 +0100)
committer	Andrea Corallo <akrl@sdf.org>
	Thu, 14 May 2020 06:14:23 +0000 (07:14 +0100)
		1	2
lisp/subr.el	patch \|	diff1 \|	diff2 \|	blob \| history
src/lisp.h	patch \|	diff1 \|	diff2 \|	blob \| history